From 08b4e442d3509d1fba5401f7cac51fe6ffd9c6e0 Mon Sep 17 00:00:00 2001
From: Glenn Morris <rgm@gnu.org>
Date: Wed, 25 Apr 2007 05:53:17 +0000
Subject: [PATCH] *** empty log message ***

---
 etc/ChangeLog  | 6 +++++-
 lisp/ChangeLog | 6 ++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/etc/ChangeLog b/etc/ChangeLog
index 382332860f0..922a75d582b 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,4 +1,8 @@
-2007-04-25  Yavor Doganov <yavor@gnu.org>  (tiny change)
+2007-04-25  Werner Lemberg  <wl@gnu.org>
+
+	* emacs.1: Replace -- with \(em.
+
+2007-04-25  Yavor Doganov  <yavor@gnu.org>  (tiny change)
 
 	* emacs.1, etags.1: Escape some minus signs.
 
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 2f27f16a928..236221f174c 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2007-04-25  Mathias Dahl  <mathias.dahl@gmail.com>
+
+	* image-dired.el (image-dired-display-image): Derive image-type
+	from filename rather than assuming jpeg, in case no resizing was
+	needed.
+
 2007-04-25  Johan Bockg,Ae(Brd  <bojohan@dd.chalmers.se>
 
 	* custom.el (defface): Doc fix.
-- 
2.30.2